Add support for environmental variables