Transition table improvements

Moved to class based identifiers.