Adding Timeout config option