Substitute is now called only for String and Integer