Added Substring class [ci skip]