Yes should be added to all classes.

I do appreciate that you spend some time on this, thanks.