Add additional event handlers and remove render function