Validation client&server-side added