Removed Model base class