Tuple generator added, topologies updated