Transition classes refactor.