Adding new query capabilities