Fix
Add support for slave servers