Support a bit more of Rust