BUG-865: Deprecate ExtendedType