I think that I prefer this design to the one that was there before (multiple classes) :)