Rearranged some code between the Load_model module and Data_common.