Improved SchemaBuilders and made SchemaDefinitions to generate improved ones.