Implemented base of query object

Change-Id: Iae65fccd40407e112085c1833e3d86a8c2ac7e2f
Merge "Implemented base of query object"