Add RFC5988 and RFC6906