Added data loader and table