Added more query functions. These are a temporary solution. Creating RequestHandler factory.
Merging branch.