Update logic in Proxy to re-use taggerHandle