Adding client validation and model spec