Add support for server aliases