Additions to data model