Dictionary replaced with DataTables