Added Composite Functionality