Fixed Composite classes. Now keep track of children.