OIS support for Snapshot