Added checks for route