Refactored Composite