Added min length and fields match validations