Rework on controllers