Slipnet refactorings