Added support for explicite rollback