Added the date format option