More refactoring of Sponate