Added client override settings