issue #59 - include fields from supertypes in ModelBuilder