SLICE-8 Refactoring