Add snapshot support for new Curve system