Initial buggy integration of OrderedHashMap to the directives

Reviewer: Dan V.