Changes for RFC 8040 compliance