Added date formatting