improve Data Model