Improve DataTable

fixes #1382.