Sync model types/lengths with original DB values
Add missing import
Update uses of models w/ new attribute names