More snapshot support