Added some changes to the string entity types