Fix Interception Data Controller & API