Updated for latest Rust