Adding environment variable support