Changed to use a server manager class for potential future additions