Added validations for client