Removing StateMachine implementation dependencies