Added 404 functionality