Support proposal-246 (optionals)