Added string escaping