Adding 404 support