Add correct date formatting