Migrated to .isoformat() where appropriate