- Update to use latest singleton method