Adding state based notifications