updated dataModel