Update for System::LoadGeneric