Refactored into two projects/dlls to remove core mapper dependendency on DAMP, and instead use the custom mappings