Add support of Snapshot