Add escaping and marshalling