Add more assertions for custom data paths