Updated feature: Improved Model base class