Add basic type kind + basic type if conditions