improvements to factory modules