Added calculating class
Fixed bug in QueryParser