Modernizes singltons