Adding supporting changes for TriggerHappyAI to run