REFACTOR Making features consistent in create and update