Sponge: Update for latest API changes