Simplified and documented the data models