Improved Controller Support