Updated to latest data model