Better code resliency and translateEscapeCharacter support