Replaced usage of TableId in meta-data population.