Made Model POJOs match data schema from backend