Loader improvement & request wrapper fix