Add support for aliases for server names