Refactoring and added Class Roll combination