Yep, the main issue here is that there was no classification before.

Do you want an updated PR ?