FIX Use strings for type keys
Merge pull request #337 from simonwelsh/patch-3

FIX Use strings for type keys