Finished refactoring into multiple notification types