Changed to support better module routing with speed optimizations