Expand environment functionality take2