Added support for slave servers