Backed up all singletons by corresponding SPI interface, no basic functional change.