Adding support for environment option.