Added StoryInfoAttribute and code refactoring