More notification handler work