Completing Model inheritance

I didn't give enough attention to the warnings.