Added support for multiple servers