Added Composite, Iterator. TODO fix missing tests for Composite.