data model overhaul