Export Options as well...

[ci skip]