Added TODOs for json string escaping