Restructure models and add more data.