Added rollback support