Add multi-server capability