Prepare for legacy reduction of RD MC