Added more intelligent detection + parsing of date fields