Added snapshot / restore for data