Adding handling for DecoratorDefinition cases