Update date fields - Better inheritance