Update commands to search by UUID