Internal Refactor Topology