Added ability to load modules