Replaced TableId usage for meta-data population.