add environment variable support