Modification of dataModel to suit new changes