Add support for snapshots