Improved signal management