Feature/allow change model