Update mapper to allow easier extending
Merge