HPCC Structure revision