Started to fix Rust part