Changes in helpers, main agent, etc.