Added more escape sequence support