User interrupt handler changed to a class