Improved the Models for Controllers