(fix) Fix hard-coded data models to match server's returned data