Now supports date-only format