Updates for new id formats