Refactoring Domain Supervision