Added flexible element dictionaries.
Merge branch 'flexible-element-dictionary' into develop