Update structure and inclusion