#37 - Support both mutable and immutable custom mapper when defined