Add environment variable support