Improve controllers logic