Added modification date handling