Adding support for non-local database server