Added alert support