Add more advanced querying and change usage accordingly.