Partial optionality support