Increase usability for SOS