Add target to EventHandler annotation