Improve data models

4 data models, story—date, theme—theme_story