Added string replacement