refactoring mappingContext