Updated ClientLoader