Updated alert service