MIFOSX-365: Simplify 'Data Table' functionality