Improve send alert feature