Added RFC 5987 defs