Added support for dynamic module loading