Switching from base matcher to type safe matcher