comments
refactored the TMappingExclusion handling