Removed dependence on query file: queries are generated automatically