Added client_spec; extended agent_spec