Adding classes from draft-hildebrand