Improve Data Model