Restored TypeMatcher to keep BC and marked as deprecated