Added subtype level debugging