Snapshot sanity functionality added