Beginning to refine data model - fix ISO8601 dates