Add toggle for atomic -> savepoint