Put back passing handlers to notification methods