Update for crate_id removal