Add custom handler support.