Added ability to specify server