Updated many validator rules