Refactoring
IQueryPartDecorator