Added completion timeout