Added client validation