this way we can use that list easily in the modules, and keep the list
for later module building.

Depends on D11896