Small changes in DefinitionController