* Refactored Mapping.Toolsl