Added new module-loader for testing