Improve Type parser a bit
Improve dictionary instantiation so we can do superclasses