Updated to Cargo project