Change the structure of the handler and create a 404 page