Added C and assembly handlers