Removed individual tokenTag lists per type in favour of one ordered list
with type annotations