Added missing event handlers