Rebuilding Endpoints and finalized much of the global topology model