This is a remaining item from #260 to be addressed later. This would bring the databases into more standard cross-referencing format.