Added some sysinfo awareness.