Updated to work with Rust master