Changed data model for new requirements