Add ability to define an environment other than local