Extend TypeInfo to cover Composite types