Feature/update models