models updated to proper fields