Adapat to BAK and storymap 8