Add more structure to datapath