Improve Alert System