Added labels to more closely match spec.