Ring layer refactoring