Update to be closer to wd03 definitions. Not everything is valid in wd03 so there may be a few differences.