Create infrastructure timing params only if necessary (#347)

Create infrastructure timing params only if necessary (#347) #217