Added environmental variable support.