added a query language parser