Add escaped unicode support