Added handler code.