Added date format management