Updated Type

Includes check for the basic type and its subtypes.