Refinements to configuration/environment