Adding a few extra methods and properties to support a multi-server setup