Added formatting for dates