Upgrade string interpolation