Added support for local servers