More refactoring to pub_date_elements