Code structure update