Add more interrupt handlers