Updated todo
No more toString in type, use of getName
Made types singletons as they are stateless