Patch with new relative-explicit imports