In RFCService, Add RFC23, RFC25, and weird logic to RFC21