Use iter dict for org handler