More schema walking & reworking of schema types