Added better string interpolation