Added isInvalid boolean