Refactor in Story resource