Updating views to handle new data model
Updating worker to new data model