Customizable env
Refactoring