Adding support for different database connections