[CR] structural updates