Update server to work with new data model