CDB-1997 #fixes Adds more specs.