Refactored Interrupts management

Refactored Interrupts management