Adding additional event handlers