Reduce usage of SOS API classes