Added snapshots and fixes