Improve notification module, closes #10