Improved controllers layer