Updated api and models