started moving towards a simpler data model