Refactored Environment and updated imports to named.