Feature/alert handling