Improve some of the logic around servers