Added custome routes & alert handeling