Validation now handles requiredfields correctly