Add eggstool-based fallback