some refactor of lookup data.