Added environment variable setup