Added ability to manage servers