Improving static module list handling