Added story support