Sponge: update for latest API changes