Convert types on update and create