EMOD-Hub · mesokurtic · Jun 24, 2026 · Jun 24, 2026 · Jun 24, 2026
diff --git a/Eradication/AdditionalRestrictions.cpp b/Eradication/AdditionalRestrictions.cpp
@@ -8,7 +8,6 @@
 namespace Kernel
 {
     BEGIN_QUERY_INTERFACE_BODY(HasIntervention)
-        HANDLE_INTERFACE(IConfigurable)
         HANDLE_INTERFACE(IAdditionalRestrictions)
     END_QUERY_INTERFACE_BODY(HasIntervention)
 
@@ -54,7 +53,6 @@ namespace Kernel
     }
 
     BEGIN_QUERY_INTERFACE_BODY(HasIP)
-        HANDLE_INTERFACE(IConfigurable)
         HANDLE_INTERFACE(IAdditionalRestrictions)
     END_QUERY_INTERFACE_BODY(HasIP)
 
@@ -97,10 +95,7 @@ namespace Kernel
         release_assert(false);
     }
 
-
-
     BEGIN_QUERY_INTERFACE_BODY(IsPregnant)
-        HANDLE_INTERFACE(IConfigurable)
         HANDLE_INTERFACE(IAdditionalRestrictions)
     END_QUERY_INTERFACE_BODY(IsPregnant)
 

diff --git a/Eradication/AdditionalRestrictionsAbstract.h b/Eradication/AdditionalRestrictionsAbstract.h
@@ -17,6 +17,8 @@ namespace Kernel
         AdditionalRestrictionsAbstract();
         virtual bool Configure(const Configuration* config) override;
 
+        virtual IConfigurable*  GetConfigurable()  override  { return JsonConfigurable::GetConfigurable(); }
+
     protected:
         bool m_CompareTo;
     };

diff --git a/Eradication/AdditionalRestrictionsHIV.cpp b/Eradication/AdditionalRestrictionsHIV.cpp
@@ -9,7 +9,6 @@
 namespace Kernel
 {
     BEGIN_QUERY_INTERFACE_BODY(IsHivPositive)
-        HANDLE_INTERFACE(IConfigurable)
         HANDLE_INTERFACE(IAdditionalRestrictions)
     END_QUERY_INTERFACE_BODY(IsHivPositive)
 
@@ -75,7 +74,6 @@ namespace Kernel
     }
 
     BEGIN_QUERY_INTERFACE_BODY(IsOnART)
-        HANDLE_INTERFACE(IConfigurable)
         HANDLE_INTERFACE(IAdditionalRestrictions)
     END_QUERY_INTERFACE_BODY(IsOnART)
 
@@ -99,7 +97,6 @@ namespace Kernel
     }
 
     BEGIN_QUERY_INTERFACE_BODY(HasBeenOnArtMoreOrLessThanNumMonths)
-        HANDLE_INTERFACE(IConfigurable)
         HANDLE_INTERFACE(IAdditionalRestrictions)
     END_QUERY_INTERFACE_BODY(HasBeenOnArtMoreOrLessThanNumMonths)
 
@@ -147,7 +144,6 @@ namespace Kernel
     }
 
     BEGIN_QUERY_INTERFACE_BODY(HasCd4BetweenMinAndMax)
-        HANDLE_INTERFACE(IConfigurable)
         HANDLE_INTERFACE(IAdditionalRestrictions)
     END_QUERY_INTERFACE_BODY(HasCd4BetweenMinAndMax)
 

diff --git a/Eradication/AdditionalRestrictionsSTI.cpp b/Eradication/AdditionalRestrictionsSTI.cpp
@@ -10,7 +10,6 @@
 namespace Kernel
 {
     BEGIN_QUERY_INTERFACE_BODY(IsCircumcised)
-        HANDLE_INTERFACE(IConfigurable)
         HANDLE_INTERFACE(IAdditionalRestrictions)
     END_QUERY_INTERFACE_BODY(IsCircumcised)
 
@@ -34,7 +33,6 @@ namespace Kernel
     }
 
     BEGIN_QUERY_INTERFACE_BODY(IsPostDebut)
-        HANDLE_INTERFACE(IConfigurable)
         HANDLE_INTERFACE(IAdditionalRestrictions)
     END_QUERY_INTERFACE_BODY(IsPostDebut)
 
@@ -58,7 +56,6 @@ namespace Kernel
     }
 
     BEGIN_QUERY_INTERFACE_BODY(HasMoreOrLessThanNumPartners)
-        HANDLE_INTERFACE(IConfigurable)
         HANDLE_INTERFACE(IAdditionalRestrictions)
     END_QUERY_INTERFACE_BODY(HasMoreOrLessThanNumPartners)
 
@@ -125,7 +122,6 @@ namespace Kernel
     }
 
     BEGIN_QUERY_INTERFACE_BODY(HasHadMultiplePartnersInLastNumMonths)
-        HANDLE_INTERFACE(IConfigurable)
         HANDLE_INTERFACE(IAdditionalRestrictions)
     END_QUERY_INTERFACE_BODY(HasHadMultiplePartnersInLastNumMonths)
 

diff --git a/Eradication/BroadcastCoordinatorEvent.cpp b/Eradication/BroadcastCoordinatorEvent.cpp
@@ -5,9 +5,7 @@
 #endif
 
 #include "BroadcastCoordinatorEvent.h"
-#include "InterventionFactory.h"
 #include "Log.h"
-#include "EventTriggerCoordinator.h"
 #include "NodeEventContext.h"
 #include "SimulationEventContext.h"
 
@@ -16,7 +14,8 @@ SETUP_LOGGING( "BroadcastCoordinatorEvent" )
 namespace Kernel
 {
     IMPLEMENT_FACTORY_REGISTERED( BroadcastCoordinatorEvent )
-    IMPL_QUERY_INTERFACE2( BroadcastCoordinatorEvent, IEventCoordinator, IConfigurable )
+    BEGIN_QUERY_INTERFACE_BODY(BroadcastCoordinatorEvent)
+    END_QUERY_INTERFACE_BODY(BroadcastCoordinatorEvent)
 
     BroadcastCoordinatorEvent::BroadcastCoordinatorEvent()
         : JsonConfigurable()

diff --git a/Eradication/BroadcastCoordinatorEvent.h b/Eradication/BroadcastCoordinatorEvent.h
@@ -20,6 +20,8 @@ namespace Kernel
         virtual bool Configure( const Configuration * inputJson ) override;
         virtual QuickBuilder GetSchema() override;
 
+        virtual IConfigurable*  GetConfigurable()  override { return JsonConfigurable::GetConfigurable(); }
+
         // IEventCoordinator methods
         virtual void SetContextTo( ISimulationEventContext *isec ) override;
         virtual void CheckStartDay( float campaignStartDay ) const override { };

diff --git a/Eradication/CalendarEventCoordinator.cpp b/Eradication/CalendarEventCoordinator.cpp
@@ -11,8 +11,8 @@ SETUP_LOGGING( "CalendarEventCoordinator" )
 namespace Kernel
 {
     IMPLEMENT_FACTORY_REGISTERED(CalendarEventCoordinator)
-
-    IMPL_QUERY_INTERFACE2(CalendarEventCoordinator, IEventCoordinator, IConfigurable)
+    BEGIN_QUERY_INTERFACE_BODY(CalendarEventCoordinator)
+    END_QUERY_INTERFACE_BODY(CalendarEventCoordinator)
 
     CalendarEventCoordinator::CalendarEventCoordinator()
     : StandardInterventionDistributionEventCoordinator(false)//false=don't use standard demographic coverage

diff --git a/Eradication/CampaignEvent.cpp b/Eradication/CampaignEvent.cpp
@@ -11,7 +11,6 @@
 #include "Log.h"
 #include "Configuration.h"
 #include "Configure.h"
-#include "ConfigurationImpl.h"
 #include "CampaignEvent.h"
 #include "EventCoordinator.h"
 #include "FactorySupport.h"
@@ -29,7 +28,7 @@ namespace Kernel
     template CampaignEventFactory* ObjectFactory<CampaignEvent, CampaignEventFactory>::getInstance();
 
     CampaignEventFactory::CampaignEventFactory()
-        : ObjectFactory<CampaignEvent, CampaignEventFactory>( false ) // do not queryForReturnInterface
+        : ObjectFactory<CampaignEvent, CampaignEventFactory>()
     {
     }
 
@@ -75,8 +74,8 @@ namespace Kernel
     // CampaignEvent
 
     IMPLEMENT_FACTORY_REGISTERED(CampaignEvent)
-
-    IMPL_QUERY_INTERFACE1(CampaignEvent, IConfigurable)
+    BEGIN_QUERY_INTERFACE_BODY(CampaignEvent)
+    END_QUERY_INTERFACE_BODY(CampaignEvent)
 
     CampaignEvent::CampaignEvent()
         : start_day(0.0f)

diff --git a/Eradication/CampaignEventByYear.cpp b/Eradication/CampaignEventByYear.cpp
@@ -14,8 +14,9 @@ namespace Kernel
     //
     // CampaignEventByYear class here.
     //
-    IMPL_QUERY_INTERFACE1(CampaignEventByYear, IConfigurable)
     IMPLEMENT_FACTORY_REGISTERED(CampaignEventByYear)
+    BEGIN_QUERY_INTERFACE_BODY(CampaignEventByYear)
+    END_QUERY_INTERFACE_BODY(CampaignEventByYear)
 
     CampaignEventByYear::CampaignEventByYear()
     {

diff --git a/Eradication/CommunityHealthWorkerEventCoordinator.cpp b/Eradication/CommunityHealthWorkerEventCoordinator.cpp
@@ -24,7 +24,8 @@ namespace Kernel
     // ------------------------------------------------------------------------
 
     IMPLEMENT_FACTORY_REGISTERED(CommunityHealthWorkerEventCoordinator)
-    IMPL_QUERY_INTERFACE2(CommunityHealthWorkerEventCoordinator, IEventCoordinator, IConfigurable)
+    BEGIN_QUERY_INTERFACE_BODY(CommunityHealthWorkerEventCoordinator)
+    END_QUERY_INTERFACE_BODY(CommunityHealthWorkerEventCoordinator)
 
     CommunityHealthWorkerEventCoordinator::CommunityHealthWorkerEventCoordinator()
     : m_Parent( nullptr )

diff --git a/Eradication/CommunityHealthWorkerEventCoordinator.h b/Eradication/CommunityHealthWorkerEventCoordinator.h
@@ -48,6 +48,8 @@ namespace Kernel
         virtual bool Configure( const Configuration * inputJson ) override;
         virtual QuickBuilder GetSchema() override;
 
+        virtual IConfigurable* GetConfigurable() override { return JsonConfigurable::GetConfigurable(); }
+
         // IEventCoordinator methods
         virtual void SetContextTo( ISimulationEventContext *isec ) override;
         virtual void CheckStartDay( float campaignStartDay ) const override {};

diff --git a/Eradication/CoverageByNodeEventCoordinator.cpp b/Eradication/CoverageByNodeEventCoordinator.cpp
@@ -85,8 +85,8 @@ namespace Kernel
     // ------------------------------------------------------------------------
 
     IMPLEMENT_FACTORY_REGISTERED(CoverageByNodeEventCoordinator)
-
-    IMPL_QUERY_INTERFACE2(CoverageByNodeEventCoordinator, IEventCoordinator, IConfigurable)
+    BEGIN_QUERY_INTERFACE_BODY(CoverageByNodeEventCoordinator)
+    END_QUERY_INTERFACE_BODY(CoverageByNodeEventCoordinator)
 
     CoverageByNodeEventCoordinator::CoverageByNodeEventCoordinator()
         : StandardInterventionDistributionEventCoordinator( false )//false=don't use standard demographic coverage

diff --git a/Eradication/DelayEventCoordinator.cpp b/Eradication/DelayEventCoordinator.cpp
@@ -8,7 +8,8 @@ SETUP_LOGGING( "DelayEventCoordinator" )
 namespace Kernel
 {
     IMPLEMENT_FACTORY_REGISTERED( DelayEventCoordinator )
-    IMPL_QUERY_INTERFACE2( DelayEventCoordinator, IEventCoordinator, IConfigurable )
+    BEGIN_QUERY_INTERFACE_BODY(DelayEventCoordinator)
+    END_QUERY_INTERFACE_BODY(DelayEventCoordinator)
 
     DelayEventCoordinator::DelayEventCoordinator()
         : TriggeredEventCoordinator()

diff --git a/Eradication/FirstNodeWithNodePropertyEventCoordinator.cpp b/Eradication/FirstNodeWithNodePropertyEventCoordinator.cpp
@@ -121,7 +121,8 @@ namespace Kernel
     // ------------------------------------------------------------------------
 
     IMPLEMENT_FACTORY_REGISTERED( FirstNodeWithNodePropertyEventCoordinator )
-    IMPL_QUERY_INTERFACE2( FirstNodeWithNodePropertyEventCoordinator, IEventCoordinator, IConfigurable )
+    BEGIN_QUERY_INTERFACE_BODY(FirstNodeWithNodePropertyEventCoordinator)
+    END_QUERY_INTERFACE_BODY(FirstNodeWithNodePropertyEventCoordinator)
 
     FirstNodeWithNodePropertyEventCoordinator::FirstNodeWithNodePropertyEventCoordinator()
         : TriggeredEventCoordinator()

diff --git a/Eradication/HasRelationship.cpp b/Eradication/HasRelationship.cpp
@@ -17,7 +17,6 @@ static constexpr float DAYSPERMONTH = (DAYSPERYEAR / MONTHSPERYEAR);
 namespace Kernel
 {
     BEGIN_QUERY_INTERFACE_BODY(HasRelationship)
-        HANDLE_INTERFACE(IConfigurable)
         HANDLE_INTERFACE(IAdditionalRestrictions)
     END_QUERY_INTERFACE_BODY(HasRelationship)
 

diff --git a/Eradication/IncidenceEventCoordinator.cpp b/Eradication/IncidenceEventCoordinator.cpp
@@ -463,7 +463,6 @@ namespace Kernel
     IMPLEMENT_FACTORY_REGISTERED( IncidenceEventCoordinator )
 
     BEGIN_QUERY_INTERFACE_BODY( IncidenceEventCoordinator )
-        HANDLE_INTERFACE( IConfigurable )
         HANDLE_INTERFACE( IEventCoordinator )
         HANDLE_ISUPPORTS_VIA( IEventCoordinator )
     END_QUERY_INTERFACE_BODY( IncidenceEventCoordinator )

diff --git a/Eradication/IncidenceEventCoordinator.h b/Eradication/IncidenceEventCoordinator.h
@@ -180,6 +180,8 @@ namespace Kernel
         virtual bool Configure( const Configuration * inputJson ) override;
         virtual QuickBuilder GetSchema() override;
 
+        virtual IConfigurable* GetConfigurable() override { return JsonConfigurable::GetConfigurable(); }
+
         // IEventCoordinator methods
         virtual void SetContextTo( ISimulationEventContext *isec ) override;
         virtual void CheckStartDay( float campaignStartDay ) const override { };

diff --git a/Eradication/NChooserEventCoordinator.cpp b/Eradication/NChooserEventCoordinator.cpp
@@ -729,7 +729,8 @@ namespace Kernel
     // ------------------------------------------------------------------------
 
     IMPLEMENT_FACTORY_REGISTERED(NChooserEventCoordinator)
-    IMPL_QUERY_INTERFACE2(NChooserEventCoordinator, IEventCoordinator, IConfigurable)
+    BEGIN_QUERY_INTERFACE_BODY(NChooserEventCoordinator)
+    END_QUERY_INTERFACE_BODY(NChooserEventCoordinator)
 
     NChooserEventCoordinator::NChooserEventCoordinator()
     : m_Parent( nullptr )

diff --git a/Eradication/NChooserEventCoordinator.h b/Eradication/NChooserEventCoordinator.h
@@ -244,6 +244,8 @@ namespace Kernel
 
         virtual bool Configure( const Configuration * inputJson ) override;
 
+        virtual IConfigurable* GetConfigurable() override { return JsonConfigurable::GetConfigurable(); }
+
         // IEventCoordinator methods
         virtual void SetContextTo(ISimulationEventContext *isec) override;
         virtual void CheckStartDay( float campaignStartDay ) const override;

diff --git a/Eradication/NChooserEventCoordinatorHIV.cpp b/Eradication/NChooserEventCoordinatorHIV.cpp
@@ -34,10 +34,6 @@ namespace Kernel
     // --- TargetedDistributionHIV
     // ------------------------------------------------------------------------
 
-    BEGIN_QUERY_INTERFACE_DERIVED(TargetedDistributionHIV,TargetedDistributionSTI)
-    END_QUERY_INTERFACE_DERIVED(TargetedDistributionHIV,TargetedDistributionSTI)
-
-
     TargetedDistributionHIV::TargetedDistributionHIV( NChooserObjectFactory* pObjectFactory )
     : TargetedDistributionSTI(pObjectFactory)
     , m_Vector2dStringDiseaseStates()
@@ -225,7 +221,6 @@ namespace Kernel
     // ------------------------------------------------------------------------
 
     IMPLEMENT_FACTORY_REGISTERED(NChooserEventCoordinatorHIV)
-    IMPL_QUERY_INTERFACE2(NChooserEventCoordinatorHIV, IEventCoordinator, IConfigurable)
 
     NChooserEventCoordinatorHIV::NChooserEventCoordinatorHIV()
     : NChooserEventCoordinatorSTI( new NChooserObjectFactoryHIV() )

diff --git a/Eradication/NChooserEventCoordinatorHIV.h b/Eradication/NChooserEventCoordinatorHIV.h
@@ -7,7 +7,6 @@
 namespace Kernel
 {
     class TargetedDistributionHIV;
-    //struct IIndividualHumanEventContext;
     struct IIndividualHumanSTI;
     struct IIndividualHumanHIV;
     struct IHIVMedicalHistory;
@@ -47,8 +46,6 @@ namespace Kernel
     class IDMAPI TargetedDistributionHIV : public TargetedDistributionSTI
     {
     public:
-        DECLARE_QUERY_INTERFACE()
-
         TargetedDistributionHIV( NChooserObjectFactory* pObjectFactory );
         virtual ~TargetedDistributionHIV();
 
@@ -96,8 +93,6 @@ namespace Kernel
     {
         DECLARE_FACTORY_REGISTERED_EXPORT(EventCoordinatorFactory, NChooserEventCoordinatorHIV, IEventCoordinator)    
     public:
-        DECLARE_QUERY_INTERFACE()
-
         NChooserEventCoordinatorHIV();
         NChooserEventCoordinatorHIV( NChooserObjectFactory* pObjectFactory );
         virtual ~NChooserEventCoordinatorHIV();

diff --git a/Eradication/NChooserEventCoordinatorSTI.cpp b/Eradication/NChooserEventCoordinatorSTI.cpp
@@ -17,7 +17,6 @@ namespace Kernel
     BEGIN_QUERY_INTERFACE_DERIVED(TargetedDistributionSTI,TargetedDistribution)
     END_QUERY_INTERFACE_DERIVED(TargetedDistributionSTI,TargetedDistribution)
 
-
     TargetedDistributionSTI::TargetedDistributionSTI( NChooserObjectFactory* pObjectFactory )
     : TargetedDistribution( pObjectFactory )
     , m_StartYear(1900.0)
@@ -118,7 +117,6 @@ namespace Kernel
     // ------------------------------------------------------------------------
 
     IMPLEMENT_FACTORY_REGISTERED(NChooserEventCoordinatorSTI)
-    IMPL_QUERY_INTERFACE2(NChooserEventCoordinatorSTI, IEventCoordinator, IConfigurable)
 
     NChooserEventCoordinatorSTI::NChooserEventCoordinatorSTI()
     : NChooserEventCoordinator( new NChooserObjectFactorySTI() )

diff --git a/Eradication/NChooserEventCoordinatorSTI.h b/Eradication/NChooserEventCoordinatorSTI.h
@@ -57,8 +57,6 @@ namespace Kernel
     {
         DECLARE_FACTORY_REGISTERED_EXPORT(EventCoordinatorFactory, NChooserEventCoordinatorSTI, IEventCoordinator)    
     public:
-        DECLARE_QUERY_INTERFACE()
-
         NChooserEventCoordinatorSTI();
         NChooserEventCoordinatorSTI( NChooserObjectFactory* pObjectFactory );
         virtual ~NChooserEventCoordinatorSTI();

diff --git a/Eradication/NodeSTI.cpp b/Eradication/NodeSTI.cpp
@@ -25,7 +25,6 @@ namespace Kernel
 
     BEGIN_QUERY_INTERFACE_DERIVED(NodeSTI, Node)
         HANDLE_INTERFACE(INodeSTI)
-        HANDLE_INTERFACE(IConfigurable)
     END_QUERY_INTERFACE_DERIVED(NodeSTI, Node)
 
     bool NodeSTI::Configure( const Configuration* config )

diff --git a/Eradication/ReferenceTrackingEventCoordinator.cpp b/Eradication/ReferenceTrackingEventCoordinator.cpp
@@ -12,7 +12,8 @@ SETUP_LOGGING( "ReferenceTrackingEventCoordinator" )
 namespace Kernel
 {
     IMPLEMENT_FACTORY_REGISTERED(ReferenceTrackingEventCoordinator)
-    IMPL_QUERY_INTERFACE2(ReferenceTrackingEventCoordinator, IEventCoordinator, IConfigurable)
+    BEGIN_QUERY_INTERFACE_BODY(ReferenceTrackingEventCoordinator)
+    END_QUERY_INTERFACE_BODY(ReferenceTrackingEventCoordinator)
 
     ReferenceTrackingEventCoordinator::ReferenceTrackingEventCoordinator()
         : StandardInterventionDistributionEventCoordinator( false )//false=don't use standard demographic coverage

diff --git a/Eradication/ReferenceTrackingEventCoordinatorHIV.cpp b/Eradication/ReferenceTrackingEventCoordinatorHIV.cpp
@@ -10,7 +10,8 @@ SETUP_LOGGING( "ReferenceTrackingEventCoordinatorHIV" )
 namespace Kernel
 {
     IMPLEMENT_FACTORY_REGISTERED(ReferenceTrackingEventCoordinatorHIV)
-    IMPL_QUERY_INTERFACE2(ReferenceTrackingEventCoordinatorHIV, IEventCoordinator, IConfigurable)
+    BEGIN_QUERY_INTERFACE_BODY(ReferenceTrackingEventCoordinatorHIV)
+    END_QUERY_INTERFACE_BODY(ReferenceTrackingEventCoordinatorHIV)
 
     ReferenceTrackingEventCoordinatorHIV::ReferenceTrackingEventCoordinatorHIV()
     : ReferenceTrackingEventCoordinator()

diff --git a/Eradication/ReferenceTrackingEventCoordinatorTrackingConfig.cpp b/Eradication/ReferenceTrackingEventCoordinatorTrackingConfig.cpp
@@ -15,7 +15,8 @@ SETUP_LOGGING( "ReferenceTrackingEventCoordinatorTrackingConfig" )
 namespace Kernel
 {
     IMPLEMENT_FACTORY_REGISTERED(ReferenceTrackingEventCoordinatorTrackingConfig)
-    IMPL_QUERY_INTERFACE2(ReferenceTrackingEventCoordinatorTrackingConfig, IEventCoordinator, IConfigurable)
+    BEGIN_QUERY_INTERFACE_BODY(ReferenceTrackingEventCoordinatorTrackingConfig)
+    END_QUERY_INTERFACE_BODY(ReferenceTrackingEventCoordinatorTrackingConfig)
 
     ReferenceTrackingEventCoordinatorTrackingConfig::ReferenceTrackingEventCoordinatorTrackingConfig()
         : StandardInterventionDistributionEventCoordinator( false )//false=don't use standard demographic coverage

diff --git a/Eradication/SimulationConfig.cpp b/Eradication/SimulationConfig.cpp
@@ -74,7 +74,6 @@ support_spec_map_t& SimulationConfigFactory::getRegisteredClasses()
 IMPLEMENT_FACTORY_REGISTERED(SimulationConfig)
 
 BEGIN_QUERY_INTERFACE_BODY(SimulationConfig)
-     HANDLE_INTERFACE(IConfigurable)
 END_QUERY_INTERFACE_BODY(SimulationConfig)
 
 SimulationConfig::~SimulationConfig()

diff --git a/Eradication/SpatialReportMalaria.cpp b/Eradication/SpatialReportMalaria.cpp
@@ -24,7 +24,6 @@ GET_SCHEMA_STATIC_WRAPPER_IMPL(SpatialReportMalaria,SpatialReportMalaria)
 
 BEGIN_QUERY_INTERFACE_BODY( SpatialReportMalaria )
     HANDLE_INTERFACE( IReportMalariaDiagnostics )
-    HANDLE_INTERFACE( IConfigurable )
     HANDLE_INTERFACE( IReport )
     HANDLE_ISUPPORTS_VIA( IReport )
 END_QUERY_INTERFACE_BODY( SpatialReportMalaria )