Refactored roll and frame classes