Some improved features - Compatibility with FEUNotification