Added support for stories