Adding support for server specific configuration