RENAME: StateMachine tracks now entities, not categories.