Overlay refactoring.