+ Adding environment variables support
+ Adding environment variables support