FEAT: Include environment in path names