Add custom form support