more table, more handling

for primary data, handle by packet structure.