Changed data structure to only use mac for datapath info