Added Date formatting