Update for crate_id changes