Added new properties to compliance, but tables need reorg