Performance boost for Composite types with exactly two types - added missing class