Improvements to data model