Added node and edge expansion