Added support for parsing environment variables