Updated code to reflect changes made to the server repository.
Introduced a server Address class to remove unnecessary code duplication.