Updated structure diagram