1.2.5 release : Splitting single/multi listeners code, had became a mess