I know the way other event handlers are added is not ideal, but let's keep consistent for now. We can revisit these later.