better handling of system properties