Added Cargo support