ds composite cleanup, and additions.
s/ORDERED/optional/g
Merge pull request #34 from ruebot/7.x

ds composite cleanup, and additions.