Make ListModule independent