2.0.0 query

This is where the new query class was introduced.