Updated DatabaseManager