Added node types and clustering based on types