Added escape/unescape support