Improve adventure's state management