RoundBasedRegister refactoring