Update loading to conform with Loader scheme