Updates to factories