Enhanced optionality