update to use new type classes for matching