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

ds composite cleanup, and additions.