Moved SystemProperties to system module