Updated Client validation