Use a dictionary instead of a table to avoid truncating text

Use a dictionary instead of a table to avoid truncating text #41