Entities updated to support new controllers
Updating