Simplify the data model