Add support for multiple servers