StructuredType improvements (comments inside)