Refactored the classes to point to specific register