Add rollback feature