update models to reflect dev-3 changes