- Added initial code for environment handling