Updates to factory definitions