Move interrupt handling to listeners