Adds user configurable timeout