Added composite, iterator, part of State