Update to remove the assumption on "resource.id"