Improve control callback