Non-blocking implementation & dictionary update