Refactored topology