Adding support for direct DB connection