Substitution of the JAITools Range with a new optimized version on some classes