Added dictionary enumerator support.