Fix mapping in Model