Minor changes to data model