Added single argument constructor for CustomMapper
Refactored custom mapper