Changed data model structure for improvement