Change models to data_structures