Major revision of internal structures