Added character escaping