Add Snapshot and small fixes