More cargo centric build