made DataTable and Map classes more consistent