Add custom endpoint support