Include ID handling for RRPin and RRComment