Added support for ENV/SystemProperties