Moved stuff over from the rrc API