Adding client validation