Changes to StoryHandler