Enhance singleton synchronization