Modules are no longer hard-coded