This paper presents a robust enrichment strategy to model weak and strong discontinuities as well as cracks for industrial applications. First, numerical issues encountered with popular extended finite element approximation spaces are pointed out. Then, the paper gives indications on how to circumvent those issues. The very originality of the paper relies on questioning the theoretical approximation spaces with respect to numerical results and to modify accordingly their design. The relationship between the new design and the previous designs is clearly established, in order to highlight the very small implementation cost of the modifications exposed here. Hence with minimal additional computational cost, gains in accuracy can be significant as shown later in the paper.