Added TypeInfo Resolution (Says i havn't commited)