SysInfo Refactored