Adding DefinitionContext, and cleaning up Definition.