More rework on string table