improved data loading paths