Code Refactoring
Add new match case - regular expression; Xml matcher based on DOM in progress