Update to latest version of system header method