Improved control support