Started to update UI with new data model