Updated type reference to extend Type and made general updates to method handler