Update class structure