Update to reflect specification revision 0.8.4