Cleaner definition of Queries
Merged