Generalise the way extra modules are loaded

Change-Id: Icd453421b022a6450d1358edbe2132e49ca0b3bf
Merge "Generalise the way extra modules are loaded"