Refine notifications functionality