Added snapshot functionality