Added escaping to the strings