Moved client setting from agent to client; merged helper with client