Added rollback functionality