add wait-interpolation with timeout