Refactored sectors