Add neighborhood and SCC metrics