some schema changes wrt. enclosing types