Added support for other option leg fields