changed data model to lineup with api