Implemented snapshot support