Added auto-dates and fixed column mappings