Added environment variables settings support