Add devise & alert handling