Added new RFCs, broke down others for more granular control