Siome refactorings