Changes for to_str and crate_id changes