Minor structure update