Added alert features