Add default baseType to the substitution type