Renamed DatabaseQuery to DatabaseManager