Added in new snapshot feature