Add parser support for out-of-td option storage