Updated controller structure and deleted countries