Changes to support environment config / psych