Listener updated

New listener structure