Update RFC-88 and RFC-90