Updated Companion generator instances for new ModelCompanionGenerator interface