Clean up and add hub data