Refactor. Add from*() methods