Adapted for new blaze utils snapshot