Resolve #8 - Composite