Updated client loader