Added changes to factories