Prepare to move register to its own class