Added faster data loading