Make storing the topology optional