Refactored node domain management