Add sponge as an dependencie and port over more things