Added subtype counting