Revise model data-types