Made notification to service less global