Changing QueryParts to Decorators