class structure update