Handle more date formats