Updated DatabaseConnectionManager