Finished NDF-RT harmonizing with the current database structure