Add substring and substr support