First update to models to reflect API