diff --git a/abmarl/sim/gridworld/registry.py b/abmarl/sim/gridworld/registry.py
index 1de3dd7b..9da02f34 100644
--- a/abmarl/sim/gridworld/registry.py
+++ b/abmarl/sim/gridworld/registry.py
@@ -1,12 +1,13 @@
 
 from .actor import ActorBaseComponent, MoveActor, CrossMoveActor, BinaryAttackActor, \
     EncodingBasedAttackActor, RestrictedSelectiveAttackActor, SelectiveAttackActor
-from .done import DoneBaseComponent, ActiveDone, TargetAgentDone, OneTeamRemainingDone
+from .done import DoneBaseComponent, ActiveDone, TargetAgentDone, OneTeamRemainingDone, \
+    TargetDestroyedDone
 from .observer import ObserverBaseComponent, AbsoluteEncodingObserver, \
     PositionCenteredEncodingObserver, StackedPositionCenteredEncodingObserver, \
-    AbsolutePositionObserver
+    AbsolutePositionObserver, AmmoObserver
 from .state import StateBaseComponent, PositionState, TargetBarriersFreePlacementState, \
-    MazePlacementState, HealthState
+    MazePlacementState, HealthState, AmmoState
 
 
 _subclass_check_mapping = {
@@ -27,17 +28,20 @@
     }, 'done': {
         ActiveDone,
         TargetAgentDone,
+        TargetDestroyedDone,
         OneTeamRemainingDone
     }, 'observer': {
         AbsoluteEncodingObserver,
         PositionCenteredEncodingObserver,
         StackedPositionCenteredEncodingObserver,
-        AbsolutePositionObserver
+        AbsolutePositionObserver,
+        AmmoObserver
     }, 'state': {
         PositionState,
         TargetBarriersFreePlacementState,
         MazePlacementState,
-        HealthState
+        HealthState,
+        AmmoState
     }
 }