realign models to API