Improve controllers