Refactored notification class
Updated email library