Refactored DataTable