Refactored global enumeration