Add extra types. Handle interrupts.