Added support for matchit