Updates to allow required fields to validate when not provided and data exists