Fixed data loading