More stone refactoring