[u] update to use correctly pattern matching on several classes