I'm in favor of the second solution, obviously. I've spent a lot of time adding detailed Toyota chassis codes, and I'd hate it if they were wiped out (as it already happened last year for some of them).