Added type matcher to type system