Restructured Composite code