added more system properties support