Added modular interrupt code