Added Dictionary and TypeInfo classes