Extract date fields into a separate class