Parameterize network timeouts (implement #50)
Strictify "From"