Optimize module loading slightly