Refactored QueryParts to become decorators
Refactoring ProcedureQueries