Default mapper

CR wanted for this one please.