Changed escaping scheme