Fixed broken methods resulting from Cargo.java