Refactoring of dynamic parser and included the highlight feature