Added timeout field to config