from DefinitionDecorator to Definition