Update Database Queue to use CUBIDs