Fixed #9 Externalize parsing codes