Updated protocol spec, added type attribute