Added dynamic loading of modules