Fix: Works for both normalized modules and external modules