Separate data model from conversion