Add alert support