Update for NativeLoader