#83 - Use the model type in the base class