Better handling of notifications