Added escaping of quotation marks