Multi-server functionality added