Update for crate_id related changes