Added ability to add custom servers