Issue #123 #125 #197 Improve AgentNpc v2