Make the models more appropriate for new structure.