Added the rest of the stuff from SR 13392:2004.