I'm saying that because the thing that's motivated you to change it, is inheritance