Added support for different servers