Added extra modules