Fix #546 Review the composite structure diagram