Fix controllers based on new structure