Added snapshot feature