Re-architected data model