Issue #847: Improve the performance of the data tables
Forgot to commit one file