Refactored to consume stormagent.