Enhance the env handling within scoping subsys