Type identifiers are now strings, rather than enumerations/integers.
Moved types and type modifiers to json file.