So I have changes for this, unfortunately I can't remove the map though, since it is still required when a listener is removed, since I have to know which id it is linked to, but at least notifications don't require a hash look up any longer :)