Add support for rollback