Added support to new date format