Enable matchit support