Added snapshot support