add more querying features