Added support for external environment variables overriding