Moving handler wiring to the On() method