Added support for enviromental variables