Remodel data and controller changes