Many improvements - FEUNotification compatibility