Topology : Refactor Type Semantic