adds Query class suport and build step