Adding snapshot support ...