I moved the two server types to their own classes to prevent API calls to a server, not of that type.