Added new version of SPXDefines