STORM-80 : Added changes for passing in options with env set from plugins