Replace old register staging architecture