changing data model for #CN-31 In Progress