Added broker_agent on create and update