Added support for matchit
WIP