Improved MacNotifyHandler