Adds timeout handling for SOS endpoints