Add from field
Update doc string start refactoring
Refactoring