Change the way the Mapper works