Load data logic adjustments