Final loader updates