Added RFC 2 (XRAP)