Query and Query parser initial version. Make necessary changes