change mapper fields to take :data field to make objects more generic