Move to class enums for registers