Backend: Updated custom handler support