Refactored sublocality management