Added escape and unescape