Switched from inline strings to a string table