Added correct path creation to factories