Update event handler imports