Make Granite work with new Sponge