Partial support for $type