Added TypeInfo Resolution