Reworked Listener Registration