Added callback singleton