MIFOSX-40: Simplify 'Data Tables' functionality