Finish updating data models