Refactor QueryParts to Decorators