Refactored interrupts