Handle string dates also