Implemented proper interrupt dispatch