Feature/add models