Create new term at container level with all settings from existing terms that are not yet applicable to containers and do not reference individual properties: Refactor the existing complex types used by the existing terms to be derived from base types used for the properties of the new container-level term. State for each capability that it is combined with the container-level defaults using PATCH semantics, i.e. all container-level default values that are not explicitly changed in a set-level annotation still apply.