started adding support for environmental variables