Added basic Cargo support