Added prepareForUpdate()