moving the environment options to Adaptor (where they are handled)