Add more escaping