Added query methods
moved project to sub-module