Refactoring annotation in StoryDatabase