Better event delegation handling