Modified DatabaseConnectionManager