added parser for query language