Add escaping of symbols