Improvements for Controllers logic