Some agents modifications