DB/SAI: entries up to 10000 now using CMC where required.