Add support for sub-schema types