Updated data model for more flexible applications.