Refactored notification options